Merge pull request #24 from stulees/master

Initial e2e tests
Merge pull request #25 from stulees/master

Completion of e2e tests including mocking apis