First steps to make the exportable test work again