Fix tests
Improve tests