Rework end-to-end tests to focus more on business rules