refactored indices calc tests