Remove conditional test flag

Algorithm is now fixed
Add and improve comments
Improve disable sets definition