Fixed Some Tests