Continued refactoring of "create" operations. Updated tests accordingly.

Some tests fail.