Make hydrogen test more rigorous