Makefiles seem to be in order. Tests need to be updated to latest signatures—wow are they out of date!