tweaks to fix unit tests