tweaks unit tests to avoid strange bug I'm seeing on bamboo