Fixed unit test problems.