Updated docs and added test