Tweaks to unit tests