fix tests
Timeline: general fix with real use case