updated documentation, tests