Test and Validation updates