fix some test issues