added null check for declaration.property, added comment into fixture