I forgot to update the tests because they were skipped, but let's see what @fabpot thinks about this.