Improved test model and script for ASHRAESolarGain