fixed tests to be passing again