Refactored and Added user tests [#74740940]