fix the failing tests