Fixing failing DataContainer test. Starting to fix the Generic Example Filter test.