Fix test failures and add trivial test assertion.