fixed tests!