The behavior is now consistent with template creation. This commit also adds a unit test for this functionality to make sure that it will always happen.