tidying up
mo' operators, mo' tests