Fix typo.

Enable an extra test.
Improvements for tests.
Test case cleanup.