huge refactor of urls and views, leading to lots of changes in the tests