got most of tests for thermal storage model passing