add tests to update core logic further