Fixed the rest of the unit tests