Update tests for refactor.

I forgot to update the tests in light of the
refactor.
Update README in light of the refactor.