Converted to single transformer, added testcase