Added test and sample