Cleaned up the unit tests