made all tests in core work again