update tests and docs
Updated docs, minor bugfixes