Fix two problems with the unit testing.