Use idiomatic make -C X instead cd X && make in Makefile
Add test-*-clean targets to Makefile