Tweaked unit testing