Fixed UnitTest, create some dynamic fields on demand.