Fix broken tests

Fixes the broken tests