Moved maketest to makefile