fix for forms
added test
fix for test
small update