Fix and add tests, minor updates
Tweak ignore and travis