URLs for forms x2, moved code in views & tests, new URL