Added more tests for the forms