Improve Kitchen Tests

Add more Kitchen tests to ensure things are working as expected.