Renaming test to something more sensible.
Moving to factory function to unify how extensions work.