Fix broken tests

Pushed to upstream