This commit adds the unit tests for the PR. It also includes some files
that are affected by the function name changes.