Change field names to eliminate dashes in names
Add configuration for catalog of metrics to pull
Add separate test file from configuration file
Null pointer exception ; clean up names