removing require_fields as it is not required
cleaning up namespacing and adding test.