Refactor Test Utils/Helper Classes