added extra $rename test
added initial $where support