Issue #21587: Added spinner to terms and cleaned up existing tests