Replaced direct-value access by getters in Config; Genericized a large number of data structures
Cleaned up tests