TIC-3 Fix tests