Added weapon_test and did some refactoring, less dependencies. Yay!