Fix tests, add berkshelf