Changes to some current tests for better coverage and deletion of old and slow team indexing