Test improvement and documentation improvements