Fixing some renaming issues and some test code that I left in there