mote fixes
more tests