Created by: sfraczek

To anyone reviewing this: This is a change that I did quickly without thorough checking if it will work exactly the same prior to this change. This part is not tested because it is itself responsible for testing, so I assume this is critical part for correct error reporting in tests. Therefore please be cautious.