Parially fix the tests