Added/Fixed Some Test