Short test refactoring