Revised tests for simplified heat transfer methods in the trench test section.... See merge request !1