Fixed a bunch of another acceptance tests
Fixed update by query acceptance test