Added/modified files for testing with Sinatra/Capybara
Added/modified files for testing with Sinatra/Capybara