Fix dirty tests

* Makes dirty tests work again
* Fixes compile issues when enabling the LOG features in dirty tests