Extend unit tests and fix doc string