Add More test, bug fixed