Using Librarian and Berkshelf in integration tests will be excellent now when we start to support them. I'll change some of the tests to use Berkself after this is merged. The bigger integration test renovation is still waiting. I took a peek at what you had done but the branch is quite outdated...