Even less horrible and add tests/Travis