Some improvements for testing blocks for heat consumer/producer.