updates to makefile to build with sources in tests/unit - these changes mysteriously vanished in the night. Fortunately simple to re-apply.