Reduced the complexity of one of these tests that is a bit slow