Getting tests to work again