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