Remove cl-dependency. Fix tests.