Fixed tests
Improved tests