Adapt tests to new bookshelf version