NOJIRA Straighten out tests for this branch

In develop/1.5. this is all set up for Travis CI but someone might
wanna run tests in this version too