yet another attempt to fix test cases