Fixed bug with parallel tests
Resolved merge conflicts