Complete rewrite of the method injecting testing macro