Greatly clean up the unit tests