remote remote cruft. simplify test isolation