Fixing small issue so that the tests work again