Refactored TCKF implementation to address more requirements of the LDP
Test Suite.