Quick fix to failing tests