Removing temporary fix and Xfailing tests