Added necessary elements to Validation for test module, and customization files for back-compatibility