Cleaned up IndexerService and tests