Updated validation handling, added test case for upload validations.