Re-factor unit tests for create() method.
Re-factor create() method.