Small Changes to index and tests