Beefed up test target in Makefile