more fixes to e2e testing