Adding UnitTests for FK - Fixing Bug with NULL handling in XML