Renamed some functions in the unit tests code
They not matched our coding style/name convention.