Make the main test work again