Added additional unittests and renamed Query() to Transform()