I really am not a fan of excessively clever tests. That said, this test has always been rather clever, and you haven't made it significantly more mind-bending, I think it's fine. Nice work :-)