fixed tests*