Test modifications to support Travis build