Fixing broken tests (and ignoring some because reasons)