Further test refactoring, use Background for common steps