tweaks, more tests