better setup for integration testing
Merge pull request #18 from smashingboxes/feature/testing

better setup for integration testing