I agree. My main intention with this PR was to restructure the existing tests though.