Refactored KdcTest codes
Refactored KdcTest codes