Adding context transoforms and tests