some changes to make the tests work