Updated codebase for safe execution of parallel tests