Fixed more default tests failures