Failing tests again! Agrh, damn you indexes!