refactor end to end tests
Merge pull request #58 from lefthandmagic/refactor

refactor end to end tests