Cleaning up validation tests