small fixes and more broken tests