Move some test references into test-private.