Cleaned up models
Improved unit tests
Partial improvements to PartialSolarCollectorModel (in progress)