fixing and/or disabling broken tests