. The proficency test should include general handling and knowledge of pistol/revolver. I have seen lots of people that can fire some rounds but do not know proper handling and function. Maybe some portion of the proficency including some kind of firearm knowledge test.I'm not teacher but there it is. Oh yeah the wait time could be better.