Support multiple locs
More tests