Fix, minor refactor.

Tests need some love.