CIMI - Tests - modifying tests to use *Create