Improved validation suite