function name changes and tests added