Fix crazy test layout so that there's space for more tests.