fix some Tests