Improve logging and attack structure

Tests are not yet adapted.
Improve tests somewhat, and restructure breach
Improve attacks
Fix various minor tests