Some test work and renaming