It seems that just removing my local repository and cloning it again fixed the problem. I wonder if a local change didn't get removed correctly from an old local branch or something?
In short, the problem seems to have been a local issue and now builds/passes the tests. Sorry for the false alarm.
William