clean up code, make injected beans private
fix unit tests
gemtc model results cache