Tweaked weapon defaults; cleaned up test.lua