refactor stager tests