Merge "Refactor makefiles to allow just building tests."