TW-35: Fixes broken tests