Ohops, forgot to merge one fragment. Done. Now unit tests work again.