Added age limited video test.
Some refactoring.