Re: Two fixes for the testing framework makefiles