some tests Fixed
need more testing