Merge "Fix problem with singleton and parallel unit tests"