Fix: convert // More tests