Let's fix this test once and for all