Added form to view and fixed mock tests.