cleaned up index, added tests