Added more form creation methods and testcases