Add context info to validation error
Temp. disable test for validation