Renaming test
Renaming functions to be more self-documenting