Updated docs and test