[Ticket #28] Streamline `make test` and `make run` in top level Makefile