Fixed subdirectory makefiles and fixed errors on unitTests