Updated test script
Manually resolved merge conflict