foo
Improve tests