Update unit tests and docs