Fixed Some Test, still not finished