many fixes ...
updated test
updated test