updates to tests and documentation, simplifications