fixed unit test
fixed unit test
fixed NPE