Fix some Tests