Improved documentation and test readability