small improvements to failing tests