Update load path, update tests for name
Merge branch 'sinatra' of github.com:JoshCheek/miniature-octo-ironman into sinatra