repaired tests as far it was possible