got tests passing with binary rewrite