Cleanup of CoreTests to use duplicated from DymanoUnitTest