Move bonus test to the end. Make tests affected by system bug as warnings