Fix homeland defense buffs, tests