Added test and modified docs