Single test and refactor