WIP: fixing unit tests, solving algorithmic problems introduced by revised configuration.