Validation tools added + tests