Separated class and instance variables
Fixing clip video tests