Started migrating Test part of makefile down to Tests subdirectory