first step in refactoring swagger tests