fixed tests...