tests pass, no more expect
eradicating expect -- not sure about what remains