Add more test cast
Make it return Nullable instead