Split some tests up