Merge "Clear heat inner functionaltests"