fix Makefile, improve test-op