Really fixed tests