Tweaking tests for better coverage