FYI @cattanem, @apearce, @rmatev, @cofitzpa - further clean-up of orphan tests.
merged
mentioned in commit bc0337ef