* some fixes and new tests