Fix failing ci tests