Reverting change from last commit (Breaks parallelization - will need to take up the problem with JUnit)
Merge remote-tracking branch 'origin/master'