Fixed ICA dependencies and test failures