New test + doc