Makefile improvements and testling meta data