Update tests
Fixes