first pass on test rewrites