Refactoring TEST.mk