<Make file improved, test cases added.>