Use latest test kitchen and add berkshelf