Added Test Makefile

> Broke up Makefiles
> Updated VS Projects