new test
tests, docs
merged