Changed internal_index -> inner_index to match configuration.
Made tests compatible using new solver structure.