removing test-kitchen and other small test related tweaks