Add more strongly typed wrapper around `test.macro` #905

Job	Run time
Bundle: From nightly (ubuntu-latest, linked)	29s
	29s

Provide feedback