fix validate
fix tests validate
new validate + fix