tests updated.
fix makefiles.