KD: Refactored Test page