more CR changes
Annotate which tests fail