Fixed end to end tests