tidied up Cnamer/Cnamer, added test