Merge "add junit coverage"