Fixed "unit" tests.
In progress refactor
Merge branch 'weaponRefactor' of https://github.com/joycem137/FederationCommanderDashboard into weaponRefactor