Actually fixed tests