Use strings with margins, a little clean up
Add e2e tests to travis.