core: Add more tests for what we recently added