I *think* this may break other tests which depend on this. Can we add it as a second marketplace instead?