Fix for tests

Validation service is revisited