Fix failing tests
Fix load order