Cleaning up bugs in end to end test