fix minor bugs in end2end tests