More unit test corrections