Moved code in views + tests, added new URL