rename
new tests and fixes