tweak behavior and test