These changes rename the method names to something more meaningful.
It also changes the spec to test all the internal details without
stubbing the private methods.