Fixing up end-to-end tests