Added better support for parallel running tests