[#14] Simplify validators parameters
[#14] Add some validation tests