Add forms
change unit test
Fix bugs in unit test