Fix failing deployment tests