Fix tests, move from integration to feature to allow use of capybara.