Removed for-demo FhskConfig keys, cleaned up UT module loading