Minor updates to configuration and a unit test while merging time averaging