Added JUnits/Mockito and DI using Guice; refactored code and included driver/severity metadata at top level of JSON to simplify queries