fixed tests finally