- cleaning up hfcoretest in preparing for unit tests