TW-22: Fixes tests