Fixed another merge problem
Fixing barrier_test