Changed tests and validator