Added location objects for sharding trick
Fixed sharding in full-run test