wip: cleanup, more test-kitchen work