Get the tests passing on r17
Add travis test