Temporarily modify make/tests