Updated class usage to reduce multiple wording.

Updated tests to use the new usage.