Updated validation and Acceptance Tests