Added test support to Makefile