added heat tests support