more test debugging on refactor