Add missing @Beta annotations; add one test