- Updated combat & tests