Add album video support
Fix parameter order and change tests to catch