urls for forms x2, moved code in views and tests, new URL