renaming some tests, and added end-to-end