Updated docs and testing