Code cleanup for namemangling stuff

The removed model tests will be supplanted by a test for the Fish Tank
model once I get that working