tests fixed

validation fixed