Fixed failing test after re-factor.