Adapting combat system test to new architecture. This is still far from
done