Improvements to allow kitchen testing to run again

These things haven't been updated in a long time. All defaults were failing. This corrects issues and allows for testing under kitchen to continue to be appropriate.