fix cl unit tests