I think we should use the same pattern in general, but I will definitely remove the test for sure.