Cihan: test and more