Removed bad syntax from tests
Resolved merge conflicts