Adds test case. Fix tests. Reverts change to Namer