Feature/cfy 3 system tests