API and Algoriths tests pass. Re #6199.