#66: Cleanup PEP8 issues.

Fixed test cases broken by naming cleanup.