Fixes Makefile for BSD make; #2565
fix the `run` target
Fix up `make test`