Made all test suites green