Fix failing default tests
Fix failing tests