Fixed tests 3 and 5