Fixes to testst and travis