Fixed tests according to validation