end-to-end test improvements