Proper indexing of variables in coupled systems.
Updating tests.