Add support for set-up and tear-down scripts
Simplify target in Makefile