remove short circuit in tests