Fixed display of highlights; remain 5 failing tests