Allow separate test classes to execute in parallel
Merge branch 'proto-parallel-tests' into master-work