improved tests
new version