Add back some end-to-end tests