Enhance test cases and documentation