Fixed all but risk joining tests