Test for refactor