Refactored FhskCoreTest