Merge: lib/core: Fix text tests