Fix the polymorphism issues in tests
Drop the "e.g." for now
Update docs
Update Travis