Fix broken tests

This should get the tests working again