Improved test data form and if everyone is incorrect then noone is removed
Resolved merge conflicts