Documentation / Test / Little Improvement

See commit messages for details.