Fixing some misbehaving tests