Added more tests, fixed some test errors pertaining to and_form