These changes remove the tests' reliance on string output and make the expected results much more explicit.