Fix cucumber tests
Apply the knowledge about SimpleForm wrappers elsewhere