testing refactor