Fix some unit-test problems