Fixes to Validation Test