Added test and doc