Added conversion tests