CFLM-5 
Start and reorganize tests