tests adapted to account for squashOuter()
tests adapted to not fail spuriously under -neo:o1