Refactored and added NameAna-tests