Feature/test naming consistency