Fixing broken tests

This reverts commit 8fc3387adc16f83f2b83ea4dfac25e9b6beb073d.