since this was done in a semi-automatic way compilation for stuff not used by the non-decoupled tests may be non-functional. I spared the decoupled stuff because it does not compile ATM so I did not have a way verify that it still works...