finally fixed tests