These partials look pretty weird to me, but I dunno if it's worth re-writing all of these test cases.