Add Tests
Extend Doc