fix validor and tests