Fix tests
Fixes