clone added
new tests
tests fixed