<Make file improved, test output added.>