Fixed Some Test Issues