making the tests work with the lastest changes