More unit test work.