work on Core unit tests.