Multiple test fixes and updating to the new version of GitCake