Started adding tests for NameChange behavior