Update tests, update Makefiles