Add Kate's hand-tagging; update other test files