Makefile edited - targets for test as well