* fixes in tests