Merge "Remove skip for Heat-Neutron tests"