Added @rewrite test cases