fixed tests again