Form API changed, updated tests to reflect these changes. Fixes #130.