Fixed test failures
Fixed incorrect tests