Bug fix
Update test