I did a find/replace through all the fixtures and tests and replaced everything except the search fixtures to match. I wasn't sure if you guys were in the middle of playing with search fixtures and didn't want to set up a merge nightmare, but it's an easy find/replace.

Let's see what the resolution is from Damon about test marketplaces. If they really are treated differently, we're probably going to want one of each for testing.