[forms] [test] worked on basic tests, also minor fixes to all
merged with master