Refactoring & Assert test modification according to validator