Adapt to new syntax. Failing test WIP