Complete change started in previous commit and update tests.

Fixing my previous booboo.