Fix the depenency issue and add missing test data