Character and Weapon Factories are now singeltons. Tests updated. Calls

updated