Wired up unit tests properly so that they use the new Weapon API