low hanging fruit while cleaning up test failures