adapt to packages changes
fix unit test