Fix test
Add type hinting