Yes, I change this test for a cleaner code.