More tests and updated documentation