Renaming to more generic names
Adding test howl files
Renaming to generic class names