Fixing tests to work again