Fix reported error.
Fix tests.