Fixed the remaining unit tests