Added healing and tests.