Revert "Streamline "make test""
This commit did not have desired effect.
This reverts commit b690857f56363476e7cd2bba23f0df32e8460618.