Tests adapted and checked to/for CLP