Update unit test and documentation