Fixed tests 4 and 7