Fixed issues with Makefile + Aspire tests