Reorgnize test, logs more
Fixes lot of thing, reorganize, comments ...