Fix various test failures in legacy tests (i.e. not Interpolator-specific ones).
Fixed pep8 test fails introduced by pep8 v1.50.
Replaced CML
Merge pull request #19 from cpelley/interp_test_fixes_replacement

MAINT: Interp test fixes replacement