Dyktus branch

where is test 12 ?  Clean up the numering mess