Fixup tests
DerivedChargers into their own files in config package
Fixup SM parse time bug discovered by DigiDaz, adding some more tests