[DF-291] Fix tests