moved {{dollar}} rewrite check to its own test