Test clense, fix the obiovus bugs