Fixed tests to work again