defrag validations in mod, and updating unit test.