Improved tests
Fixed description