rename firearm controller, expand firearm unit tests