Coding style
Improve tests