Everything is now fixed. make and make test both run fully.

Could you merge this line and the previous one?