Improved tests
Improved tests