test refactor and adding some context