Improved tests
More tests