fixes and improvements on e2e tests