Added validity test for the example files
Some cleanup