Added form and test output