Fixed validator and most failing tests