Clean 1.x-specific test suite
Add 2.1.0 to travis.yml