Refactor tests in order to help diagnose tgriesser/bookshelf#310
Merge pull request #3 from valet-io/refactor

Refactor test suite