Partial rewrite Test