Doc and Tests cleanup.