This may not be a blocker for this PR, but this test really should be rewritten as it was. The best way is likely to create a dummy XmoduleDescriptor which acts like the old video module (setting some fields in its constructor but keeping metadata around). I would mark this as a priority; the correct persistence of metadata is very important.