Test initial refactor