Fixed tests 8 and 12.