Cleaning up the unit tests