Debugging why the tests are failing
Merge remote-tracking branch 'origin/master'