Kernel manipulator improvements:
    - fix unit test dependencies