WIP - minor fixes, e2e tests

I want to see what Travis says about my tests.