little test refactoring...