add created & updated tests
merge
fixed query tx bug