Added end-to-end tests