2nd refactor test