Light refactoring, better names
Fix incorrect test prefix