Update test case to new return format.

Also, the comparison check is old, new or better, known -> unknown
Don't YAML'ify empty strings to `None`
Merge pull request #11658 from s0undt3ch/2014.1

2014.1 fixes