Move integration tests
Merge pull request #2 from pmorie/refactor

Move integration tests