Reimplement a few missed tests