Updated docs and some tests