Incompat: change interface for the future when we change implementation
Add a basic test