removed old code that was already commented out
streamlined test, and also double-checked that my refactoring for 5.44 didn't break multi-term open-coding