tests fixes
tests fixes