tweak
fix up tests