refactoring, kitchen and serverspec tests added