Updated Tests and Video Adapter