report the problem earlier
Ported this test case
I didn't really write these tests.

It's probably written by Oliver Gondza
Moving to a simpler structure