7.1: proper tests
6.13: fixes after review
8.12. - a bit more clean
7.4. - more neat