Bring test up to date with implementation