misc modifs
new tests