Trying to fix tests for Codeship