made some of the tests work again