Fixing Validation tests, added dynamic update support