* Fix test names and doc strings