Fix class hints
Update tests