fixes, end-to-end tests

same as above