Function mapping changes. Unit tests fail.