Fixed more broken tests