almost fixed tests