Cleaned some of the unit tests