minor change
fix test cases
finish deref part