tweaks to unit tests