Small fixes to make test work.