Add back in "unknown" handling

@snoyberg should be all we need to fix the tests