Fix failing test
Use type hinting