More tests and doc string