seems to have fixed tests