Risky test fix

There is some of the "tests" not testing anything(?)

See the last commit
I did it a bit differently, that what you suggested. Is that ok?