More changes related to the new test site.