Fixed tests 2