fix failing test
Merge branch 'step-5_validation'