New validation tools
New tests