Massive amount of small fixes aiming to make tests work with new design.

Still ~100 fail.