Allow warriors to be generated again
Some more test improvement