SIFD-16 fixed broken tests