In the fall, after the summer hiking and backpacking season, we like to go through our gear and test, charge up and store un-needed batteries until they are needed again. This is also a great time to clean, check the operation and update firmware if needed. It only takes a few minutes and can certainly save you trouble the next time you need your gear, and you find it doesn't work properly.
We found a great storage case for our batteries, the Ontel Battery Daddy - Battery Organizer Storage Case with Tester, which stores up to 180 Batteries of various sizes and has a clear locking lid so you can easily see what you need. We found ours at Costco, but it is sold on Amazon and various other retailers. It definitely helped in organizing our batteries and keeps them safe.