fixed tests..