Fixed typo.
A few fixes to make tests work.