tests and changes in validation