Complete change started in previous commit and update tests.