Small changes, mostly related to tests.