Create Index API update + tests
Major Test Code Refactoring