Wip/core unittests