WIP: Fix test example fails