merge confict with changes from Alex and exlude all not working tests