fixed some tests
Merge remote-tracking branch 'origin/validation' into validation