Estabilized code with unittest_ccinfra.py test wrapper, debug needed anyway