improve test cookbook and fix Berksfile