Minor cleanup for the recently merged update (spaces -> tabs, other misc) + Fixes for CreateVideo tests