Strengthen tests to check validity