[2.0.0] unit tests again

Hi,

As before - please do NOT merge this ticket as I will be adding commits to it.

Thanks,

Kamil