Fix bugs... and Finish test!!!cheers