change due to commit interchange/Interchange6@fd532d975
changes to follow commit interchange/Interchange6@ec397db06
remove some Dumper cruft from tests
hide some method from tests