Changes to main and tests makefiles