Test - Improve testing experience with expectations
Doc - Improve docstring
Fix tests