tests: cleanup a Makefile and some alphabetical ordering