Fixed test suite with current master