JLF-7: Fixed broken tests