Fix failing tests

Order matters ...