Added tests for upgrading at creation