Kitchen converge cleanup

This cleans up some kitchen settings and adds a couple of tests.