Move to Test Kitchen 1.0 and general clean-up