Fix indentation and test files location
Fix indentation and test files location
Fix validity against toolspec.xsd