Merge "Add missing test runner annotations"