Rip the tests apart and put them back together in a way that passes