Update to newly released forms library
Fix test suite to match new forms work