Suggested refactoring of different endangered status tests