updated end-to-end test