Fixed the failing tests