Fix INDEX implementation, add more specs