disable some failing tests and fix others