Updated main Makefile and testbuild.sh to run tests
Fixed conflict with testbuild.sh