Namer Tests
Namer cleanup