fix test
fix null pointer exception