added tests
Index in progress