This makes it clearer what the tests are actually doing and kills quite a bit of useless repetitions
Fixes: #552