Tweaked unit tests