Converting more annotation builder tests.