Updated to try and fix tests on Codeship