fix up the failing tests