fixed fixture structure, improving pull_request