Fix tested bugs