WIP -- continue to fix tests in wterl