Sped tests up. Refactored repeatedly to not use an index.