Remove macro with comma; pull out old TESTRANDOM code

Use "make_valid_bytes" for TESTRANDOM path.