refine dependencies, udate tests
Merge branch 'feature-refine_dependencies' into dev