Initial rewrite test