Fixes failing test-kitchen dependency
Reduces todos
Moves catchall to /cakebox