lots more tests and a few small tweaks