no need for test site check in a couple of cases, and fix a couple of tests