more naming and stuff
Useful names in Testing classes
Naming Conventions
Remove unused directives