Refactored ignored end-to-end tests