Makefile: rewrite, improve test targets