Shorten tests a little, for travis
Fix clips per second calculations