* fixes for  tests