Force-added m4 placeholder
Fixed tests