move unit tests into relevant folder and added more tests
Integration using simple http request response rather than capybara