fixed all of the unit tests and did some renaming