Added new rewrites and their tests