Updated tests and documentation