More test and doc