Tweaked unit tests slightly