Issue #2314123 by sun: Fixed various tests.