Refactor tests in order to help diagnose tgriesser/bookshelf#310