Fix broken tests
WIP: Fix broken tests