some fixes
tests fix