WIP - a few missed operators, along with just a few additional tests