Making tests work again