Adding 1 class for each view
Fixing tests