Added weapons, mobs, nsubstitute, and tests