Fixed tests!!!!