Add better labels to tests, reorder