fix problems from unit tests

Signed-off-by: rootfs <hchen@redhat.com>