Fix tests
Augment warnings