Changes to validation process and import test cases