Simplify Test Cases
Improve Doc Comments