Reorganize tests into better desc blocks